Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 20 Mar 2006 08:56:54 +0000 (09:56 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 20 Mar 2006 08:56:54 +0000 (09:56 +0100)
commit29073ce353a283bae8fa9c89b9583d2409700969
treeb08d12eab9c547d6c331260522c78bc66740d16f
parentd3e701ea7fe2be250b9d0835ec090b9add3eb21e
parent4d32eea226102cc956c636d9b9c14336519061c6
Merged.